…vel to master

* commit '8c2c1c6c9c59c39dba9f04e48b1c9fe22834c487':
  add white-black url flush deamo
  fix result json formate
  fix after restart the record time is not set

…vel to master

* commit '3c8912cd77eebfe0425cb59733966398259d0805':
  add DeviceKey in ping header and auth header.
  flag the version number

…vel to master

* commit '5e30f644f767573bfa1ed114514e20babcac1a72':
  add some comments in device_key.h
  add a device key file

…ifidog-20140822-devel

…vel to master

* commit 'bfe7efcb870a383b9a227ea4d79f4a8b19c605fd':
  修改获取设备参数方式
  fix get clients rate
  fix the bugs of function excute_shell_command(char*,char*)
  fix dog_conf_generator.sh and change ping info debug level
  fix untrusted mac firewall set
  add comments to devicekey file
  合并处理冲突
  fix iptables argments error
  add device key file
  seconds init.

…low int the auth thread,the reason is alloc memory but not free.

…vel to master

* commit 'f6b958440e8e2a0ca16563acadcd5c5c7afb4bd3':
  I changed the get clients information method,and fix the memory overflow int the auth thread,the reason is alloc memory but not free.

…vel to master

* commit '2655a82541a5092102238a2204d45e395c32afce':
  update some get device's info functions

…ifidog-gateway-devel

Conflicts:
	scripts/DOG_monitor.sh

…/wifidog into wifidog-gateway-devel

Merge version Beta-1 repository